Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update README.md #2

Open
wants to merge 134 commits into
base: master
Choose a base branch
from
Open

Update README.md #2

wants to merge 134 commits into from

Conversation

michaelsingh100
Copy link

No description provided.

@cpollett
Copy link

cpollett commented Oct 9, 2014

Hey Michael,

You generated a pull request of the original repository not my fork.

@hongde88
Document SeparatedListAdapter.java
9796e79 
Documented SeparatedListAdapter and updated a new link to the article of separating list adapter.
@michaelsingh100
Copy link
Author

Oh my... alright, I will regenerate a pull request to you then. If I send
it by 5pm, will you still accept the pull request?

On Wed, Oct 8, 2014 at 10:11 PM, cpollett [email protected] wrote:

Hey Michael,

You generated a pull request of the original repository not my fork.

—
Reply to this email directly or view it on GitHub
#2 (comment)
.

@cpollett
Merge pull request #1 from hongde88/master
70e6be9 
Document SeparatedListAdapter.java. Congratulations!
@cpollett
Copy link

cpollett commented Oct 9, 2014

Hey Michael,

This is due by Friday, so you still have time.

Chris

On Oct 9, 2014, at 4:56 AM, michaelsingh100 [email protected] wrote:

Oh my... alright, I will regenerate a pull request to you then. If I send
it by 5pm, will you still accept the pull request?

On Wed, Oct 8, 2014 at 10:11 PM, cpollett [email protected] wrote:

Hey Michael,

You generated a pull request of the original repository not my fork.

—
Reply to this email directly or view it on GitHub
#2 (comment)
.

—
Reply to this email directly or view it on GitHub.

@michaelsingh100
Copy link
Author

I have been trying to fix my pull request but it is unable to let me...

On Thu, Oct 9, 2014 at 10:41 AM, cpollett [email protected] wrote:

Hey Michael,

This is due by Friday, so you still have time.

Chris

On Oct 9, 2014, at 4:56 AM, michaelsingh100 [email protected]
wrote:

Oh my... alright, I will regenerate a pull request to you then. If I
send
it by 5pm, will you still accept the pull request?

On Wed, Oct 8, 2014 at 10:11 PM, cpollett [email protected]
wrote:

Hey Michael,

You generated a pull request of the original repository not my fork.

—
Reply to this email directly or view it on GitHub
<
https://github.com/Sravan2j/Cinequest-Android/pull/2#issuecomment-58463961>

.

—
Reply to this email directly or view it on GitHub.

—
Reply to this email directly or view it on GitHub
#2 (comment)
.

System Administrator and others added 12 commits October 18, 2014 15:50
Added comments to some undocumented classes and clarifid some classes
8039141
Updated with necessary changes
a69577e
Applied Requested Changes
282fc40
@johnsmiller
Changed 'Schedule' to 'My Cinequest'
dbc2ca9
@8Mobius8
Merging in commits made by other students in CS 175 course.
14b08d8
@cpollett
Merge pull request #19 from Ofek86/master
2ffd446 
Applied Javadoc Changes
@sreenidhipm
Commit for First part of Paint the App Red, Issue #11
8444e4a
@cpollett
Merge pull request #22 from sreenidhipm/Sreenidhi-Cinequest-Android
fd8e602 
Commit for First part of Paint the App Red, Issue #11

Looks Fine
@cpollett
Add some missing imports, delete whitespace, a=chris
c46fb83
@8Mobius8
We should really git fetch upstream more often.
b7ae702 
Merge commit 'c46fb83e6ca3b716c4cb47a9b3281dbb59a15516'

* commit 'c46fb83e6ca3b716c4cb47a9b3281dbb59a15516':
  Add some missing imports, delete whitespace, a=chris
  Commit for First part of Paint the App Red, Issue #11
  Applied Requested Changes
  Updated with necessary changes
  Added comments to some undocumented classes and clarifid some classes

Conflicts:
	Android/src/edu/sjsu/cinequest/MainTab.java
@shwu2012
issue #13 fixed
f17eca9
@shwu2012
issue 13 films and events buttons updated
6ace69f
ofek86 and others added 30 commits January 19, 2015 20:44
Adding filmreel3.jpg
5660a00
removing filmreel2.jpg
2e5f367
adding two new images one for splash and one for news banner
5fb1ae0
adding two new images one for splash and one for news banner
edc3746
adding androidsplash due to naming conventions
e0dac90
@cpollett
adding more stuff to ignore list
a484449
@cpollett
Changes cinequest guid, a=chris
4bb4d65
Fixed Schedule not showing
248c793
Fixed Schedule to display in a chronological order
378ea43
@cayhorstmann
...
a562bcd
@cayhorstmann
removed .idea
b608a5c
@cayhorstmann
Videos playing
7f6a8a4
@cayhorstmann
Schedule fix
af329d4
@cayhorstmann
New splash screen
c73586c
@cayhorstmann @mopsal
added - android:versionCode="1601251907" android:versionName="16.0125…
8ab332a 
….1907" to the manifest header for the Google Play store to accept the signed APK (mopsal)
@cayhorstmann
...
3c2734f
@cayhorstmann @mopsal
added - android:versionCode="1602041503" android:versionName="16.0204…
28808ec 
….1503" to the manifest header for the Google Play store to accept the signed APK (mopsal)
@cayhorstmann
...
4087b2f
@cayhorstmann
Merge branch 'master' of github.com:cpollett/Cinequest-Android
9d2f8c8
@cayhorstmann @mopsal
added - android:versionCode="1602060938" android:versionName="16.0206…
87be56e 
….0938" to the manifest header for the Google Play store to accept the signed APK (mopsal)
@cayhorstmann
...
82cc7e3
@cayhorstmann
Merge branch 'master' of github.com:cpollett/Cinequest-Android
3891821
@cayhorstmann
...
568207b
@mopsal
added - android:versionCode="1602081518" android:versionName="16.0208…
e6295b6 
….1518" to the manifest header for the Google Play store to accept the signed APK (mopsal)
Merge pull request #1 from cpollett/master
3cbdcdb 
Trying to Merge cpollet and my branch,
@mopsal
Updated Gradle, updated splash screen image
5c11fe2
@mopsal
Updated Gradle, updated URLs for trending and venues
23fc69b
Merge pull request #75 from Ofek86/master
8f0369f 
Merge pull request #1 from cpollett/master
@mopsal
Updated newsFeedURL to point to main feed from Agile Ticketing - mopsal
aa95c5c
@mopsal
Merge remote-tracking branch 'origin/master'
39da57d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.